Remove custom dispatcher, fix tests
Remove simple configuration usages
Add setUpForTestPure
Use setUpForTestPure when possible without huge changes
Minor clean up