Improve re test