Amended tests to work with the new version and fixed a problem they uncovered.