Fix tests and cleanup.
Depend on Dignifiedquire/ottypes to make the tests pass.