minor resolve cleanup; add xfailed test cases