Added tests for MFP-6123