Upgrade to use latest Resources package and refresh mocks