unittest improvements