Work in progress.
1. Update time only.
2. Updated unit tests.