upgrade to Ember 1.3.1.1
upgrade to Ember Data 1.0.0-beta.6
fix tests after upgrade to Ember 1.3.1.1