Remove unneeded databags and add template serverspec for import suite
Add drupal make test suite
re-order test suites