Put Server address into Endpoint address
Tidied tests, more to do