Added tests

Addresses #30
Likewise