Maybe fix tests