Merge "Discover unit tests in "Unit" directory"