More ActivityService unit test fixes
Merge pull request #1528 from markewallace/BugFixesTake4

Bug fixes take4