Tests refactoring
Merge tag '2.04' into COMPOR
Task 2.04 finished for COMPOR