Fix rank-validity testing