Fixed issues with grunt tests so build can pass