Updated test files for new format