Fix tests to conform to current spec (I think).