Fix tests post-revision