First refactoring of the tests to fit JSHint #3 #4 #5 #6