Merge "[k6] Refactoring k6 tests (#1)"