Issue #6. Add tests