fixing some issues when testing against 'prod'