Fix fixtures definition. Thanks ryanh@irc
Cleanup and let ember create and initialize required controllers