fix tests, format