Prevent NPE when serverURL is null
Update Unit tests
Remove duplicate serverURL validation check
Remove warnings from UnifiedMessageTest