Simplified for full test environment