Fix second hit being marked with sc=start
Improve unit test coverage.