Clean up newly caught linting errors
Fix jasmine tests temporarily