new tests
refactored mihail
some tests added