More test work.
This has now been fixed.
Cleanups.