Improved test coverage of resourcedata refactor
Merge branch 'master' into switch2newrestapi