Some tests. Closes #36