many more tests
fix tests