update upstream & add test