More circular deps
Explicit expectAssertion
Fix typo
Backing out of imported emberDeprecate
Back out of importing Logger. Tests are based around globals