Fix tests post-merge