ISPN-5038 Remote package refactor

* fixed cross-site tests

https://issues.jboss.org/browse/ISPN-5038