Add test to illustrate GH-295
Only include fetched fields in initial hash of sources

Should avoid unnecessary queries, as detailed in GH-295.
Merge branch 'no-extra-queries' into develop

* no-extra-queries:
  Only include fetched fields in initial hash of sources
  Add test to illustrate GH-295