Removing the possibility of overlapping subsets in the form tree.
Augmenting tests.