More fixes, let's try just grunt tests for now