Test Unit for PR #7