Moved part of test cases to another class

Some of the test cases were modifying the shared container and then cleaning up
in a 'finally' block, causing a lot of extra code. I put them into a separate
class that creates a new container after each test case run and removed the
manual cleanup code.

Change-Id: I8ad3768bef584fc29e2abeed9d21988cf710107a
Merge "Moved part of test cases to another class"