fixed tests and coverage