Made testing better
Dist doesn't belong