Issue #52 - final tests