Tests refactoring
Writing tests for 3.01
Merge tag '3.01' into 00
 task 3.01 finished for OO