Fix tests post-6722