663d5026d8
This commit includes a lot of minor changes in testdata: new infrastructure requires that each test file in one testdata file in one module must have unique name, but a lot of existing spec tests didn't satisfy this requirement