Fix test
Modify to generic compare validator