Fix tests that were broken by 165e9d9