Upgrade doctest to use new singletons