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