Small fixes to the various tests to get them all passing again.