CSIT-1124: Support multi-sample tests