MX-1232, add test cases