Fix test failures [Chase HEAD]

This is currently WIP.

d.o issue: https://www.drupal.org/node/2343023