Some corrections in FileType test

Still failing due to file add form not yet being completed.