Fixes for JIRAs CIDEVMI-1575, CISWMI-287 and CISWMI-282. Updated unit te...

...sts.