Fixed the rest of the broken tests
Changed the meaning of threshold quantity
Resolved conflicts between my changes and Robinson's