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