Some more work on test_02