Writing tests for 1.16
Merge tag '1.16' into OO