Updated tests and coverage