fixed Sasha's commit
restructure of test cases
Merge remote-tracking branch 'origin/master' into Evgenii
Merge remote-tracking branch 'origin/Evgenii' into Evgenii

Conflicts:
	src/main/java/test/performance/ManageMapTest.java
refactoring