WIP: red/green tests for distinct-resources event query changes
WIP: tests passing
WIP: cleaning up test comments