moar and better test coverage