#36858Clean up and fix unit tests for FAL
Description
Clean up and fix the unit tests that got broken with FAL.
Streamline the API (especially the folder part) according to the tests.
Clean up and fix the unit tests that got broken with FAL.
Streamline the API (especially the folder part) according to the tests.