Changing tests to match the config changes