Make sure it works on Cloud, and for rollbacks