Writing tests for 1.13
Merge tag '1.13' into oo
Task 1.13 incomplet for OO