Norman's unit testing code back in action

The broken tests are not enabled; they will be enabled as they start
passing.