Merge changes I22f90c90,I2d965212,Ib7d421f5

* changes:
  Separate the collation of singletons from registration
  Defer registration of singletons and pre-singletons in TestContext
  Ensure mutators used in tests are in the same order as at runtime