WebScenario and JarScenario code refactored