[PLINK-130] - Improvements to the File and JPA stores. Small changes to the test suite.