Update fabric
Update fabric and tests