Update tests, rename distance & range builder #build to #set