Fixed remaining Unit tests

Mostly small changes and missing steps as fallout from the broader testing
changes.