Writing tests for 2.02
Merge tag '2.02' into OO
Task 2.02 not finished for OO