Added more fields to Person schema in tests.
Make tests more robust.