Tweaks. The test failures at least make sense now.
Progress. Chasing test bugs.