Refactoring scenarios to take into account JS and NON-JS - WIP