checkpoint: refactor scenario builder/inspector; note one failing test due to returning wrong BuiltScenario