Update tests after REF-INT / REF-EXT changes