Merge "Include file content in scenario tests"