Several new Scenario Unit tests

Got coverage of this class up to 68%. Eh.