fix move rank + update tests
fix move rank, update tests