Accompanying this commit are a few test fixes (e.g. enable previously disabled
tests, remove tests with incorrect assumptions, skip tests earlier, mark more
tests as slow, etc.) and some minor refactoring.