Fix tests, appease the cop