Writing tests for 1.25
Merge tag '1.25' into OO
Task 1.25 finished for OO