Update fabric
Update unit tests