ThingTest fixed again.
Manifest tests fixed.