Also please do this in a new PR. This has nothing to do with fallback for the test folders.