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