Remove some methods from the Scenario public API
Add markers for better test coverage