Testing working for both flat and partitioned.