Some changes to the tests configuration