Fix unit tests

All tests are OK now.