Merge "Move backup tests from servicestests to mockingservicestests"