Testing task improvements