Starting to do key signing via HMAC; Added unit tests
Fixed merge conflict