Add tests from Minghui