Merge "Unit tests: mock some time.sleep and time.time"