enhanced serialization
Updated test files