More tests

Closes #21 and #22.