Replacing instances of orm.type.get_value() with fauxfactory methods. 

Also, resolving merge conflicts. This should finish addressing #1378.