More work on test_simple.