InitialSetupTest and DeploymentTest fixed