Fix tests

Closes #48