fix tests in master