Better names and test coverage