Copied over code from BrowseBase to fix tests