Fix remaining jasmine test failures