A lot of test conf changes

- Hopefully fix some test issues
Remove spork
Probably fix some tests