+ more tests
fix tests