Refactored production test