More changes to avoid tests failing
Refactor moderation and SRO access
Adjust test to refactored moderation
Use latest version of mollom module