Added more folder tests