Fix tests and rename unStaticPtr to staticName.