reorganize tests
Merge branch 'fedor-test-split'