Writing test for 4.04
Merge tag '4.04' into COMPOR
Task 4.04 not finished for COMPOR