Cleanup and updated tests for docker < 0.10