Tweaks to the tests to get them fully passing.

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