WIP - Fix up tests.