Fix tests

Hopefully this fixes #28