More test specs. Misc. changes
Merge branch 'master' of https://github.com/adampetrie/cinephile