Fixed user_addr related failing tests. Thanks @smn! \o/ \o/