ISPN-5038 Remote package refactor

* fixed cross-site tests