JRFB357 updated test cases from Shan