Fixing UnitTests (for recent design changes)