Fixes #44: Made DPDS test faster and refactored it