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