moves addCleanup few lines upper to avoid potential leftovers

this is a quick fix which corrects an oversight, the addCleanup
supposed to be used after the create step was instead placed right
after the get step

Change-Id: Ide099e1e1b0dcffb42e7c3f86f787d10fbcb34fd
Merge "moves addCleanup few lines upper to avoid potential leftovers"