Add tests. Fixes Issue #65