Added tests

this closes #13