move tests to proper place
fix tests
add more tests