Writing tests for 1.22
Merge tag '1.22' into OO
Task 1.21 finished for OO