Refactoring: added test options to individual test scenarios.