Tests: Tupelize the return argument of expect() to include a failure reason, and update users.  Fix some expect's missing assertTrue.