Fix validation unit tests