Prevent calculating moved rows more than once
Merge branch 'dev' into draggable
Add a few basic tests