Writing test for 3.04
Merge tag '3.04' into oo
Task 3.04 finished for oo