Changes per PR.
Adding functional tests for activation