Revert "Revert test changes."

This reverts commit 310eca1d7294179b537f520d05627ec060adc145.
Use the concrete type for the test reports container so that @Nested can find the additional outputs.