Fix foldermodel autotest

David Edmundsonrequested to merge
work/folder_unit_test into master

We are waiting for a signal in a test. It may fire multiple times due to timing, it may not.

Merge request reports