Fix heading bug and add unit tests

Stephen Drequested to merge
heading into master

Also smarter logic for heading wrap-around

Merge request reports