use docker-services for clean room testing
simplify setup
minor simplification and vbump docker-services for faster exits