Update test cases; add test cases for MAGN-747