refactored and dried out DRD in tests
moved and renamed some things