Segregated some testing of persistent data into a separate class, for easier @Ignore if necessary; other minor fixes