Fixed Include spec test
Added FilesMatch spec test and fixed template