Fixes for the Activities and Forum Service unit tests
Merge pull request #1512 from markewallace/BugFixesTake2

Bug fixes take2