Test annotation creation. Clean up a little.