Fix some wrapping logic, fixes worker demo
Fix worker in demo
Fix removal tests