Issue #1: down to 3 test failures