better tests
fix tests