Removed a dead method, and refactored the tests a bit