Issue #73 Add tests