Modify distance measure tests