Added some additional tests, including the MECHA batch test.