Fix InterstopDistance indicator and add test for ad-hoc system