Writing tests for 1.04
Merge tag '1.04' into OO
Task 1.04 finished for OO