Just fix tests