Revert "Re #7215. Fix some tests that had unprotected constructors."

This reverts commit 0615c2252e560fe112ca64c8e280031000ac2c6a.
Not fixing this now.