Fix unit tests post merge