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