Fix unit tests
Some changes