Add assumptions
Fix test