Adapt tests for grizzly keystone