Snap scrolling: additional tests, cleanup