Added test expansion strategy