Updates to timestamp retrieval operations. Updates to corresponding unit tests.