Update tests after merge