Group by validator disease groups

More, and better, tests will follow in branch 124, as much of it will change again.