Created FakeFundamentalDiagram class and fixed many bugs in the
ExpandUncontrolledIntersection code