Fix Validatable tests