Merge "Moving scenario docstring under the relevant test method"