and fix tests