Merge pull request #30 from wshafer/master

WEBCMS-113 - Factorys and Factory tests complete for RCM
Fix for test suite