Updated to new test format.