reorganize tests
make everything composer-friendly