Writing test for 3.04
Merge tag '3.04' into OO
Task 3.04 NOT finished for OO