Avoiding race condition with suggestions not being added early enough
Fixing tests