Follow refactor proper master branch tests

Fixed id to match order imposed on inserted follow ops.

hivemind!321 (merged)

added 4 commits

• 25e212a8...380a6a4a - 3 commits from branch master
• a8554ac1 - Rebase to current master

Compare with previous version

mentioned in commit d8c41b9b

merged