Make test and file match filename

As per feedback from @mattr-