Improve Fabric Features Tests