Merged 2 tests dependent on each other

One created metadata, the other deleted them. They would fail if they would get
ran in a different order or individually.

I also refactored them a bit to do this.

Change-Id: I21a8ab9f077e742eb40ea29fcea5e04f9d7dd043
1 file changed