Updates to tests
Updates to grunt