Continued work on test_02