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