Test fixes.

Got the remaining specifications passing again.