fix tests, again