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