refactorings
make test frameworks modular