Temporary work around for a failing UT

There is some clean up which does not seem to be happening
properly. Changing the sequence of tests seem to fix this issue
locally at least.

Change-Id: I626c68bc32479bcbc2d71007a177fede21824e59
Closes-bug: 1404412