Fix test failures due to incorrect validation