Simplify before-blocks; add test checking for all files in a directory