Add unix time (second argument) functionality
Update tests and include unix time in tests