merge test from XShan