better test for current file layout

fixes issue #54