[SQUASH ME] unittests: fix merging error