Fix tests for next gen.