Output more logging when generating test data
Allow skipping of 'prevent_persist'
Updated test data
Allow for less logging in test mode
Store all annotations so updates can be performed