Create some general test-helpers
Replace test-helpers in Dindel with general-purpose versions