Cleaned up address mapping including tests