Fixed rule based factories

All tests passed. Stylecop green