Merge "Add more necessary infra to CSTest" into main