Merge "Clean-up PersisterQueue tests" into qt-dev