Big CI commit
Completely reform tests in an effort to make them build at least