grunt errors fixed, all tests passing