Docker tweaks to improve integration tests