MIFOSX-995 - Added Integration tests to avoid reoccurence