add tests
fix tests