renamed a method refactored the tests a bit