fix tests
fix bug