Get basic infrastructure for integration tests, clean up some messes.