clean unit tests
clean unit tests
some tests
test code
no static mess