Added some tests, Closes #7