@Aaron1011 Well, ideally not, but right now I think we should go for some decent-ish test coverage and then we can look into refactoring tests and the code later. As the test suite is right now in master, it's not giving us any value at all (in fact it's more of an annoyance), but with these changes it would at least give us some idea of whether we've broken anything at all. They're probably really brittle, but I think it's an improvement overall.