Merge "Adjust unit tests for supporting chain partition with no ab" into main