Unfortunately random work. A bit of housekeeping on tests.