Fixing Address to pass UTs