IssueTest corrected. time() function mocked
Merge remote-tracking branch 'origin/master' into issue_5