fixed unit tests
merge
MAR-3790
MAR-3791
MAR-3791
Merge branch 'develop' of ssh://git.marketshare.com:7999/des/ms360uiux into develop