Merge "Add an initial set of tests for Trust." into tm-dev