updated/added tests and caching for current time
removed unnecessary variables in test