Renaming into nice variables in annotated items. Fixes to the testing framework of the main executable.