Comment out a ton of tests and fix up the rest to build