Writing test for 4.04
Merge tag '4.04' into OO
Task 4.04 finished for OO