Fix solo logic to fix tests