fixed Unit test after merge