Moved old datset specific testbed classes to a single, better-named package