Changing strategy (aka horses, midstream, etc) to go to factories
Adding ContextFactoryTest.