replace none check
added joining test
added tests for addresses