fixed the few uncommented tests that delt with choke points and move repitition rule. still need test doubles for rest of commented tests. also rearanged a few things in other files, hence the changes