Fixes tests
Removes host name dependency