Corrected unit test failures
CORE-5300