Merge "Clean up the k6 test suite"