Testing Cleanup

Reworking to use FactoryGirl rather than Factory, related to version upgrades.  Need to work this out with other Rails upgrades.