null pointer corrected
Changed test format
Updated test file
Merge branch 'master' into daryl_storage