Fixing date unit tests
Fixing numbers serialization