(1) Completed first draft of test_engine code. (2) Minor cleanup of code layout.