Unit Tests

- Upgraded tests to newer format.
TDB2

- Updated ID:UUID mapping on ::add, which is the first part of the fix for
  TW-1389.