Add timestamp to events after rebasing onto master

Fixed all related tests. No test failures not in trunk (3 tests were already failing on master before this commit)