Merge "Adding tests for temporary and renewable trust" into tm-dev