WIP: Test-writing. Unrelated things broken.