The basename filed in the file info returned by FileModel was incorrect
for files with the incorrect extension, flagged up by failing unit test
cases.

A number of changes have also been made so that the unit tests run
correctly and without spurious failures.