adjusted tests
fix all tests
refactoring
add mor tests