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