Added tests and jslint corrections
Code correction, moving on to develop
Merge branch 'feature/tests' into develop