compatibility with master ember-cli
improving matcher dsl
more dsl work