Attempting to fix tests