MIFOSX-1288,MIFOSX-1280,build#699 testcase fixes