Introduce DeploymentWatch impl and refactor tests