Fixing tests related to the new config parameter