Issue 30 tests

Issue itself was resolved by #35 .