Add PRIMITIVE_CLASSES
Persistence tests
Fixed persistence bugs
Persistence tests