Refactor test
Add interop tests