Merge "Add basic WSI rendering test" into nyc-dev am: 165f1f7