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