Merge "Fix interpreter tests."