Can't figure out how to get this to work with DockerClient.
Another functional improvement.
Explain why these are not generic tests.
Tweak comments.