Fix tests. Closes #104