Fixed the boilerplate test failure, and removed some tests that were failing that aren't intended to be fixed in this branch.