Merge pull request #2914 from teddyzeenny/refactored-test-promises

Only catch promise errors after injecting helpers
Ember.Test unchain helpers