Feature/tests

Fixes #174