Fixes 5 more tests
Fixes another test
Fixes about a dozen more tests.