Changed the factories not to create objects if they already exist.
Also renamed various test data to have names that don't conflict with
the fixtures,