Feature/update hrf and grf

Support Berkshelf and test-kitchen.