Fix gravator hash and add tests