Update tests post-merge