Checking for declared singleton type. Tests seem to pass, but the issue is still there.