Update code, add tests for Issue #208.