Fixed rank, added test for it
Renamed field