Fixing incorrect method call
Merge branch 'emberCli' into emberCliMerged
Cleaning some tests