fix tests with current code