Mostly test fixes so that sqlSyncTest passes on Drupal 8.