Merge "Update test to not assume 2 max SIMs"