Factorize expectations
Factorize tests
Prepare for interface changes
Mark what will change during the rewrite
Move tests
Merge branch 'topic/PrepareRewrite' into develop