fix bug
fix tests