WIP:Dmitriy/Update specs according to docs

Andrey Veltischev requested to merge dmitriy/spec_refactoring into master

Merge request reports