All tests now pass using modular batch testing.