Feature to add annotations from command line through 'store' and 'add' commands

This adds "--annotations" to the 'store' and 'add' commands.

I also refactored the tests to move all annotation related tests to a separate function for easier independent testing. This had the unfortunate side effect of making a confusing diff, I think due to similar code blocks.