Added in latest changes for adding tests and jslint