Fixing tests and grunt stuff.