Modify Test 37 to better test the token solver. A new constraint that refers to another constraint has been added to test the formula parsing.