Fix unit tests related to activation
Merge pull request #35 from ironcladlou/dev/build-deploy

Activation and proxy status update fixes
Minor prepare changes