fix failing tests in master