Try to fix tests