Tests: adjust to better assist parsing around instanceof
+ fix a merge error
3 files changed