Clean-up shinkentest and test-cases: Use a mix-in class instead of ugly code.