Switch to using vertices in markers
Add distance to markers
Add minor differences in marker vertices for tests
Improve realism in tests
Update TODO