Fix test failures

Still working out the kinks with the new grunt build :P