More work on tools/test_x