Clean unittests
Fix rebase issues.