Pull in changes from switchify/ember-test-helpers