more tests and coverage