FIX numerous (but not all) jasmine tests