Work on fixing broken things, Test::Tester2 is working again (mostly)