fix tests, more