Store methods dispose() and close() have been refactored. Unit tests have been improved.