Corrected UnitTest issues