Updated tests and grunt