Fixes in the rotations
Add tests