Merge "Change assert statements to raises in CheckValue"