Fallout from globs/re-export/shadowing change
Tests