Renamed time and hmac parameters and updated tests.