Added more tests and coverage metrics