Fixed method names and tests are passing =D