Add test data to a conference, specifically location fields
 - Also fix a table renaming issue that somehow got missed in master