updates to tests and subdirectory finder