Fixed collections bug, fixed all tests to prepare for removal of ExportInfo.