Added flag for threshold vs parallelize
Removed unused tests.