Revert "Revert "Using type-tags for test SingletonVaults""