I fixed Yue's integration test for 8a oh boy.  Also fixed the scenario for 3b to be consistent with the code/integration test