Writing tests for 1.21
Merge tag '1.21' into oo
Task 1.21 incomplete for OO