r184100 Fix -- Updated test cases for contextual conversion