More work on the operations and tests