Improved the testing of diagonal markings.