Updated for test2c and test2d.