Fix InterstopDistance indicator and add test for ad-hoc system

Maybe add a comment or TODO here describing why the +/- is necessary.