WIP, more minor removals of tests.