Added more fields to make test more exhaustive