Upgrade and add test