More refactoring to hammer tests into shape
Again, bring two worlds together