unittest improved