SureFileStore test fix and style fixes.