Fixed up the remaining tests to work with draft-07.