WIP: fix all the tests (still missing tests for some DPs)