Fixing tests
Adding support for time default value