Added more coverage tests