Change assertEquals to assertEqual
Merge branch 'master' into modular-js