Fix whatever the merge broke...?
Wrote another set of tests for #33

Closes #33