Added unit tests for MFP-6124