Further grunt & test cleanup