More work on the Tom Swift kata