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