Issue #217 adds incomplete tests