Added some TestCase helper mixins
Cleanup