fixes for drupal test running