Refactor cleanups for test_trusts

While executing test_trusts, tests that throw exceptions
before the cleanup call but after resource creation can
cause resource leaks. This change aims to address this by
changing the cleanup call to be closer to the original
resource creation.

Related-Prod: PRODX-2516

Change-Id: Ifd1f987ad8f5cf712aa42d4b8927b4a157be6787
1 file changed