fixing UnitTests