XD-997 Adding partitioning tests