Refactor test name and add diagonal checking