Added more ranks and tests