Feature/testing

Fixes issue #17