Updated test-persistence xml and java