Revert "Fix test" - this seems to break all production builds

This reverts commit c5a23e2e98d29e81f524bd818b7d68bf72e0b280.
Revert "Adapt to generalization of ::getSubResourcesAssayMultiMap"

This reverts commit ec016ded52ecaa305f6eff47ea0ffd33d52eda7e.