Changed defaults-file to defaults-extra-file in all test files