Partition support and Test cases refactoring.