Changed test format
Merge branch 'master' into daryl_storage
Comments, author tags, some minor fixes
Merge branch 'master' into daryl_storage