More work on the tests for, and the implementation of, classes and modules.