Merge "Make connectivity test less backend dependent"