Add MM-4.1 core testing support