Unit test validator bug fix