Issue #20: Cleanup - use ResultTIOMatcher