Some more 0.16 test case cherry picks