Fixing some tests that are broken on master
Fixing other broken tests
JsHint
Merge pull request #1306 from cohitre/fixMaster

Fix master