First round of Jasmine test cleanups