Merge pull request #475 from iamqizhao/master

Refactor interop tests