Test async cleanup

Cleans up problems with async methods in tests so we can use the Ember testing helpers