adapting test to current situation - unclear what has caused this: one foot note in the distribution seems lost Afghanistan 20,21 ??
copy drupal7 dataportal module into trunk