updated tests and coverage