Writing tests for 1.10
Merge tag '1.10' into oo
Task 1.10 incomplete for OO