Merge changes I9da12a70,Idd147d20

* changes:
  Add HMAC key sharing tests
  Refactor VTS tests a bit, to enable adding tests in separate files.