Backported more 2.3.20 compatibility tests