Updated fallbacks and test for server/port