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