Fix for testing environemnt