added support for tests in subfolders