System Tests Cleanup