Fix test case and Grizzly impl.