some clean up; add test for computeFitness