More test case changes from 1.7 rc 1 by Holly.