Added 3b and 1b integration tests.  Also changed the scenario/SD for 1b because it was wrong for the current dispatcher