Further refinement around the activity store - updated tests to directly use the factory, and updated factory impl to use context classloader