Merge "Put the time in TestGenerateTap()" into devel/master