Minor beautification & marking a test as XFAIL on this branch