finished refactoring injection

* must still apply it to everything else, including stress testing
update factory stress tests to use new injection
injection complete

* Everything injecting as it should
* Getting new instances of data when needed now
final refactoring

* get injection of data to be consistent and not conflict ever.  Even
have a test for it. See?  See it there?  That's the test. :)