Office hours 8.5 -- Fixing tests in Paul's code, and fixing tests.