EMM 687 : Fixed issues in unit tests.