Fixed the bad merge and tests failing because of it
Merge pull request #864 from Microsoft/quickInfoMerge

Fixed the incorrect merge and tests failing because of it