Add additional test for optional fields