Fix test file
Fix production file