Agreed that logic should be moved... but that means I need tools.py back (which I don't like) or we have to combine TestHarness/TestTime into either one object or one file...  Decisions, decisions