cleaned up tests and grunt file