Re-request of deployment activation changes, tests now passing