Parallel tweaks

More tweaks to the test suite to keep them happy when run in parallel. The main thing here is that we are no longer stubbing a transaction when testing data migrations, which seems to be the root cause of the issues we've been seeing.