corrected the test main changes
WIP: Synching codebase with Section 4
Minor merge fixes