Updated documentation and modified factories to more consistently implement expected object creation/mapping functionality