Bug 1023792 — Fix Hawk implementation and update the tests

https://bugzilla.mozilla.org/show_bug.cgi?id=1023792
not compatible with hawk.