Merge "Refactor DPMS tests to be able to test more different cases."