new module for tests
add docs and change short names