Fixing UnitTest