ensure that location info for SPIRE data is normalized
fix test failures caused by eol data updates