Adds Ember testing and cleans up a bunch of code