Rename method
Simplified some ember routing stuff
Small test refactoring