Get up to 588 tempest tests passing.

(and 130 failing)