Fix test name
ISPN-3587 Add remote query support in ispn server

* Fix classes to load classes in a nicer fashion for server modularity