applied small fixes to dpc model, updated its test
also renamed the other tests