Fix the remaining signaling unit tests.

This needs to land after you review Byron's PR which it incorporates.