Added better test coverage