changes some configuratuon i the code to make it more robust to fails
during test