MIFOSX-1738 should include unit test cases