Revert to using non-parameterized tests, makes it simpler to debug.