Remove grizzly
Fix test