Use helper method in folder tests

Use helper method to clear root folder in folder tests