Dropped unnecessary tests
Fixed up a conditional, added a new Distance test.