Edited UnitTest according to prior changes