Made test coverage better