updated the test suite for recent changes (for 1.7.4.1rc2).