Added missing template layout exception
Merge branch 'AlfonsoUceda-master'
Made CI solid: removed the accidental dependency between tests order