Format a bit, change tests around

TODO: real tests
Make DistanceQueryBuilder be a static class, add toString to DistanceQuery