Merge "More robust fixes for constant used by test."