Issue #54: straighten out tests