Removes old commented code
Adds new fitness measures
Improves test data loading function