More tests and fixes #113

Closed marron-at-work closed 1 week ago