Added tests

Addresses #30