Testing of Fabric

Testing of Fabric plus fixes to templates