Changes tests in light of https://drupal.org/node/2088511.