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