Test cleanup: inheritance
Test cleanup: operational
Test cleanup: removed unused code from Util
Test cleanup: moved all helper types into the same, appropriately named package