Writing tests for 1.21
Task 1.20 finished for oo
Merge tag '1.21' into oo
Task 1.21 not finished for OO