Adding new files to testing
Merge https://github.com/vivalesteve/test