Writing tests for 1.22
Merge tag '1.22' into COMPOR
Task 1.22 finished for COMPOR