fix tests, pass