Remove extra calls to docker server.
Fix broken integration tests

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Merge pull request #396 from dnephin/remove_extra_calls

Remove extra calls, test bug fixes