Fix more Jasmine tests (and some bad naming)