Merge "Bugfix: Error when using API(v1) to run test suite"