introduce polishing unit tests

[Schmoho]

The lack of unit tests makes refactorings of any kind somewhat dangerous. Also there is significant documentation value to be had here.

This issue serves to bundle commits that introduce unit tests and minor refactorings on the polishing code (as opposed to the annotation code).

This is related to #117 , #119 and #120