Cleaned up some lingering signals in the test suite that were causing spurious failures with Pypy and Postgres.