The previous version of this patch caused some test failures due
to conflict with the hackage-fetch mocking in tests/hackage.scm.

This set reworks the tests to not mock, and incorporates updated
versions of the previous patch sets

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=35812
 (fix cabal tests)

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=35846
 (braced properties)