Write a few more tests (#503)

* Write a few more tests

* pytestify this whole jam
2 files changed