Minor Cleanup
Minor Refactoring
Persistence Integration Tests.