WIP: Add more tests

Applies to #9