Modify test cases to work on ST2 and ST3