Added a test for MPS-12537