add new tests
fix tests