Make list files work
Merge branch 'master' of github.com:Gomez/acceptance-testing