Remove the "subroutine ok redifined" warning and simplifying the counting of tests.