WIP: Add more tests.