Getting integration tests working, and a new config