Adjusted expected file naming convention to match changes from #130.  Fixes #132.