All 'tools' tests passing now.