moving scenarios and fixing cucumber code