HPCC-0000 Add more flags for testing variants

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>