Add test cases (one xfailed, one not)

as per #3601 and #3609