Improvements to the test cases. File-based store refactoring and comment.