Refactors method names and tests