Test improvement