Fix some tests that were broken by D861

Authored by gridaphobe.

Description

Fix some tests that were broken by D861

I didn't realize that ./validate does not run every test :(

Test Plan: ./validate --slow

Update submodule hpc.

Differential Revision: https://phabricator.haskell.org/D1204