Fix tests

I think this should fix the failing tests and close #95.