testsuite: Update and un-xfail #3601 test