Tightened up use of annotations.
Cleaning up tests.