Started fixing up the testing infrastructure, not yet done
Wrapping it up and running it in