Improved test coverage of resourcedata refactor