Added tests for XFM handling