removed 'x' from one describe block
Merge branch 'AssessmentsEdit' of https://github.com/SoftServeUniversity/yunakquiz into AssessmentsEdit
fixed conflicts