Feature/tests

Addresses #55