Test suites for all ranks + fixes. More rank-specific stuff needed