VNATION-282 Cleanup of tests