DeploymentSpace class, Capacitor refactoring, tests refactoring