Refactor spec so it fails consistently and properly retrieve filename.
Use efficient index-based file name matcher, courtesy of @kevinsawicki.
Merge pull request #14 from jmacdonald/master

Refactor spec so it fails consistently and properly retrieve filename.