Added some more DCP Rules tests. Also reorganized them a bit.
Merge branch 'master' of https://github.com/chrisnc/hvx