Fixing test-case again...