Updates to tests and grunt task