Fix rollback order

This patch changes the order of two rollback calls, avoiding the chance of
tests left a test file or a test vm in the system.

Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com>