Adds additional nearest neighbor tests