First class methods to test and name refactor.