Allow tests to pass with optional fields