Testing tweaks for Dockerization