change to windsor singleton wiring
Merge branch 'change_unit_test_to_wire_store' into isolation