fixing issues with test and production environments