WIP on file lookup and tests