REFACTOR reduced address added test