Fix: Fix: Fix: Test Issue #7: Add unit tests (#7) (#8) (#9) Automated fix by Developer Agent Issue: #10