Merge "Fix export location used for extend/shrink tests"