Work in progress - aligning with native implementation
No longer expecting a very specific set of status updates during sync
Fixing another unrelated failure (introduced by recent renaming)
Some tests would never be properly finalized - causing hard to track issues (other tests would run in parallel etc)
Reverted earlier change
Merge pull request #231 from wmathurin/unstable

Tests fixes