Holly made another batch of test case changes for release 1.7, rc 1.