improve test and coverage