fix tests, too