Fixing tests in Survive-Java-Persistence