Update test to follow michaels changes to deployments and activation.
Merge pull request #1982 from edwardhunter/activate_rebase

Update test to follow michaels changes to deployments and activation.