Adding more coverage in the tests