Merge "Stop passing TestResources to Managers"