minor: staring to use new Test infra.