use ip addr as fallback

Jira-issue: WP-1258
fix tests

Jira-issue: WP-1258
Merge pull request #40 from aldafu/WP-1258-fix-tests-n-fallback

Wp 1258 fix tests n fallback