Added more tests (but mark as xfail until we implement/fix this functionality)