Complex deployments - expand options for ports
Complex deployments - move package out
Complex deployments - add test cases