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