Rework handling for docker arguments

This can't be merged as-is, I need to see how the parallel tests work and make some changes based on that.
Can you commit that? Or do you just run tests in a special way?