added timestamp functionality
increased test coverage