Reenabled integration tests and fixed all data files to match new format.