Merge "Add tests for getResource*Name()" into nyc-dev