add support for shards two-four, and fix test