Added more coverage to tests