Adjusted some defaults/data to fix functional tests.