Fixed randomly failing suggestion test
Fixed random test errors
Merge branch 'master' into activejob