Scenario name should be implied from manifest filename where possible
Cleanup specs