next version: add unit tests
remove not needed files