reorganize tests
Merge branch 'reorg-tests'