Removed test and added if condition for dev/prod environment