New tests, and reorganize existing DockerImageBuilder usage slightly.