Finish refactoring and get test app and HMAC Integration Tests Working.