Improve date annotator, fix tests
Add util for adjacent annotations