Cleanup tests. Closes #2