Upgraded to jasmine 2.0, removed underscore in tests