Working on getting link range testing to work the same in the C and C++ versions