Tests refactoring
Writing tests for 3.01
Merge tag '3.01' into oo
Task 3.01 finished for OO